From bc17073a2580c27161be5c620a43f4fa44c98a50 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 16 Sep 2012 23:25:40 -0400 Subject: [PATCH] Move the gtk_shadow_type check down to gtk_render_frame In gtk_menu_bar_draw, the check for shadow type != none disables rendering of the background instead of the frame. The check should be moved down to gtk_render_frame. Patch by Peter de Ridder, http://bugzilla.gnome.org/show_bug.cgi?id=670390 --- gtk/gtkmenubar.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index 72b0b919e1..c4f7e9f0d6 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -639,16 +639,16 @@ gtk_menu_bar_draw (GtkWidget *widget, border = gtk_container_get_border_width (GTK_CONTAINER (widget)); context = gtk_widget_get_style_context (widget); + gtk_render_background (context, cr, + border, border, + gtk_widget_get_allocated_width (widget) - border * 2, + gtk_widget_get_allocated_height (widget) - border * 2); + if (get_shadow_type (GTK_MENU_BAR (widget)) != GTK_SHADOW_NONE) - gtk_render_background (context, cr, - border, border, - gtk_widget_get_allocated_width (widget) - border * 2, - gtk_widget_get_allocated_height (widget) - border * 2); - - gtk_render_frame (context, cr, - border, border, - gtk_widget_get_allocated_width (widget) - border * 2, - gtk_widget_get_allocated_height (widget) - border * 2); + gtk_render_frame (context, cr, + border, border, + gtk_widget_get_allocated_width (widget) - border * 2, + gtk_widget_get_allocated_height (widget) - border * 2); GTK_WIDGET_CLASS (gtk_menu_bar_parent_class)->draw (widget, cr); -- 2.30.2